Add workaround to runtest to build cts dependencies. BUG 2141242
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml index c1362d1..2c4801c 100644 --- a/testrunner/test_defs.xml +++ b/testrunner/test_defs.xml
@@ -137,7 +137,7 @@ <!-- cts tests --> <test name="cts-permission" - build_path="cts/tests" + build_path="cts/tests/tests/permission" package="com.android.cts.permission" runner="android.test.InstrumentationTestRunner" coverage_target="framework" @@ -153,44 +153,44 @@ cts="true" /> <test name="cts-process" - build_path="cts/tests" + build_path="cts/tests/tests/process" package="com.android.cts.process" coverage_target="framework" cts="true" /> <test name="cts-api-signature" - build_path="cts/tests" + build_path="cts/tests/SignatureTest" package="android.tests.sigtest" runner=".InstrumentationRunner" cts="true" /> <test name="cts-api-signature-func" - build_path="cts/tests" + build_path="cts/tests/SignatureTest" package="android.tests.sigtest.tests" cts="true" /> <test name="cts-apidemos" - build_path="cts/tests" + build_path="cts/tests/ApiDemosReferenceTest" package="android.apidemos.cts" coverage_target="ApiDemos" cts="true" /> <test name="cts-app" - build_path="cts/tests" + build_path="cts/tests/tests/app" package="com.android.cts.app" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-content" - build_path="cts/tests" + build_path="cts/tests/tests/content" package="com.android.cts.content" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-database" - build_path="cts/tests" + build_path="cts/tests/tests/database" package="com.android.cts.database" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" @@ -204,21 +204,21 @@ cts="true" /> <test name="cts-graphics" - build_path="cts/tests" + build_path="cts/tests/tests/graphics" package="com.android.cts.graphics" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-hardware" - build_path="cts/tests" + build_path="cts/tests/tests/hardware" package="com.android.cts.hardware" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-location" - build_path="cts/tests" + build_path="cts/tests/tests/location" package="com.android.cts.location" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" @@ -232,86 +232,86 @@ cts="true" /> <test name="cts-net" - build_path="cts/tests" + build_path="cts/tests/tests/net" package="com.android.cts.net" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-os" - build_path="cts/tests" + build_path="cts/tests/tests/os" package="com.android.cts.os" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-perf1" - build_path="cts/tests" + build_path="cts/tests/tests/performance" package="com.android.cts.performance" runner="android.test.InstrumentationCtsTestRunner" cts="true" /> <test name="cts-perf2" - build_path="cts/tests" + build_path="cts/tests/tests/performance2" package="com.android.cts.performance2" runner="android.test.InstrumentationCtsTestRunner" cts="true" /> <test name="cts-perf3" - build_path="cts/tests" + build_path="cts/tests/tests/performance3" package="com.android.cts.performance3" runner="android.test.InstrumentationCtsTestRunner" cts="true" /> <test name="cts-perf4" - build_path="cts/tests" + build_path="cts/tests/tests/performance4" package="com.android.cts.performance4" runner="android.test.InstrumentationCtsTestRunner" cts="true" /> <test name="cts-perf5" - build_path="cts/tests" + build_path="cts/tests/tests/performance5" package="com.android.cts.performance5" runner="android.test.InstrumentationCtsTestRunner" cts="true" /> <test name="cts-provider" - build_path="cts/tests" + build_path="cts/tests/tests/provider" package="com.android.cts.provider" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-text" - build_path="cts/tests" + build_path="cts/tests/tests/text" package="com.android.cts.text" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-telephony" - build_path="cts/tests" + build_path="cts/tests/tests/telephony" package="com.android.cts.telephony" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-util" - build_path="cts/tests" + build_path="cts/tests/tests/util" package="com.android.cts.util" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-view" - build_path="cts/tests" + build_path="cts/tests/tests/view" package="com.android.cts.view" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework" cts="true" /> <test name="cts-widget" - build_path="cts/tests" + build_path="cts/tests/tests/widget" package="com.android.cts.widget" runner="android.test.InstrumentationCtsTestRunner" coverage_target="framework"
